A few trivial cleanups from the HVM merge.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index b699f4af545d0553e319e45d06b20bf53c291133..98fe22ba8798f1f3894b97f5c2fe397440b82538 100644 (file)
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -10,8 +10,6 @@
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <mach_apic.h>
-#include <asm/hvm/vpit.h>
-#include <asm/hvm/vcpu.h>
 #include <asm/hvm/support.h>
 
 #include "cpu.h"

diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c
index 2629fa36719f5b0a86a241393ed6ac4d23d78f43..600735f7db1ce42838da22dd058cd261d7a7a6aa 100644 (file)
--- a/xen/arch/x86/dom0_ops.c
+++ b/xen/arch/x86/dom0_ops.c
@@ -454,8 +454,8 @@ void arch_getdomaininfo_ctxt(
 
     if ( HVM_DOMAIN(v) )
     {
-       hvm_store_cpu_guest_regs(v, &c->user_regs);
-       hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
+        hvm_store_cpu_guest_regs(v, &c->user_regs);
+        hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
     }
     else
     {
@@ -476,3 +476,13 @@ void arch_getdomaininfo_ctxt(
 
     c->vm_assist = v->domain->vm_assist;
 }
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */

diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
index fbdc6320117760f59ac1c679db78b8500fa98654..01b54ef9ab14ac4e3c5cd6646ee6fa72af8a0d66 100644 (file)
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -188,7 +188,7 @@ long subarch_memory_op(int op, void *arg)
     l3_pgentry_t l3e;
     l2_pgentry_t l2e;
     unsigned long mfn, v;
-    unsigned int i = 0;
+    unsigned int i;
     long rc = 0;
 
     switch ( op )